From e9447dac8f6be1bf1e962ff439b7bdf6bec0ec25 Mon Sep 17 00:00:00 2001
From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Mon, 11 Nov 2013 03:46:50 +0000
Subject: [PATCH] Another GDB checking for NEW_STRINGS.  This format is still a
 landmine.

---
 gpsbabel/gdb.cc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gpsbabel/gdb.cc b/gpsbabel/gdb.cc
index a1e90d119..1f0aabf0c 100644
--- a/gpsbabel/gdb.cc
+++ b/gpsbabel/gdb.cc
@@ -1824,15 +1824,19 @@ write_route_cb(const route_head* rte)
     return;
   }
 
-  char *tname;
+  String tname;
   if (rte->rte_name == NULL) {
     snprintf(buf, sizeof(buf), "Route%04d", rte->rte_num);
     tname = mkshort(short_h, buf);
   } else {
     tname = mkshort(short_h, rte->rte_name);
   }
+
   QString name(tname);
+#if NEW_STRINGS
+#else
   xfree(tname);
+#endif
 
   rte_ct++;	/* increase informational number of written routes */
 
@@ -1852,7 +1856,7 @@ write_track_cb(const route_head* trk)
     return;
   }
 
-  char* tname; 
+  String tname; 
   if (trk->rte_name == NULL) {
     snprintf(buf, sizeof(buf), "Track%04d", trk->rte_num);
     tname = mkshort(short_h, buf);
@@ -1863,7 +1867,7 @@ write_track_cb(const route_head* trk)
   QString name(tname);
 #if NEW_STRINGS
 #else
-  xfree (tname);
+  xfree(tname);
 #endif
 
   trk_ct++;	/* increase informational number of written tracks */
-- 
2.30.2